From f832e3484d146343e6f6bf4b36c4f19746f521f2 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 2 Mar 2002 19:11:47 +0000 Subject: [PATCH] Switch style of stamp file usage. Sat Mar 2 13:26:58 2002 Owen Taylor * gtk/Makefile.am: Switch style of stamp file usage. * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported enumeration/fags TYPE variables over to macros for get_type() functions, for lazy definition and to get rid of expensive relocations. * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch] gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch] gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type definitions over manually coded get_type() functions. * gtk/gtk.def: Updates for above * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}: Remove from CVS, no longer used. * configure.in: Remove checks for awk. --- ChangeLog | 20 +++++ ChangeLog.pre-2-0 | 20 +++++ ChangeLog.pre-2-10 | 20 +++++ ChangeLog.pre-2-2 | 20 +++++ ChangeLog.pre-2-4 | 20 +++++ ChangeLog.pre-2-6 | 20 +++++ ChangeLog.pre-2-8 | 20 +++++ gtk/.cvsignore | 6 +- gtk/Makefile.am | 124 +++++++++++++--------------- gtk/genmarshal.pl | 157 ----------------------------------- gtk/gtk.def | 176 ++++++++++++++++++++-------------------- gtk/gtkiconfactory.c | 26 ++++++ gtk/gtkiconfactory.h | 4 + gtk/gtkselection.c | 13 +++ gtk/gtkselection.h | 8 +- gtk/gtkstyle.c | 13 +++ gtk/gtkstyle.h | 7 +- gtk/gtktextiter.c | 13 +++ gtk/gtktextiter.h | 4 + gtk/gtktexttag.c | 13 +++ gtk/gtktexttag.h | 4 + gtk/gtktreemodel.c | 26 ++++++ gtk/gtktreemodel.h | 5 ++ gtk/gtktypeutils.c | 77 ++++-------------- gtk/gtktypeutils.h | 16 +--- gtk/gtkwidget.c | 14 +++- gtk/gtkwidget.h | 6 +- gtk/makeenums.awk | 152 ---------------------------------- gtk/makeenums.h | 5 -- gtk/maketypes.awk | 155 ----------------------------------- gtk/oldest-source-stamp | 0 31 files changed, 453 insertions(+), 711 deletions(-) delete mode 100755 gtk/genmarshal.pl delete mode 100644 gtk/makeenums.awk delete mode 100644 gtk/makeenums.h delete mode 100644 gtk/maketypes.awk delete mode 100644 gtk/oldest-source-stamp diff --git a/ChangeLog b/ChangeLog index 73439a07e2..0ee435d6e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Sat Mar 2 13:26:58 2002 Owen Taylor + + * gtk/Makefile.am: Switch style of stamp file usage. + + * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported + enumeration/fags TYPE variables over to macros for get_type() functions, + for lazy definition and to get rid of expensive relocations. + + * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch] + gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch] + gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type + definitions over manually coded get_type() functions. + + * gtk/gtk.def: Updates for above + + * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}: + Remove from CVS, no longer used. + + * configure.in: Remove checks for awk. + Sat Mar 2 04:44:10 2002 Tim Janik * gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 73439a07e2..0ee435d6e1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,23 @@ +Sat Mar 2 13:26:58 2002 Owen Taylor + + * gtk/Makefile.am: Switch style of stamp file usage. + + * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported + enumeration/fags TYPE variables over to macros for get_type() functions, + for lazy definition and to get rid of expensive relocations. + + * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch] + gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch] + gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type + definitions over manually coded get_type() functions. + + * gtk/gtk.def: Updates for above + + * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}: + Remove from CVS, no longer used. + + * configure.in: Remove checks for awk. + Sat Mar 2 04:44:10 2002 Tim Janik * gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 73439a07e2..0ee435d6e1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,23 @@ +Sat Mar 2 13:26:58 2002 Owen Taylor + + * gtk/Makefile.am: Switch style of stamp file usage. + + * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported + enumeration/fags TYPE variables over to macros for get_type() functions, + for lazy definition and to get rid of expensive relocations. + + * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch] + gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch] + gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type + definitions over manually coded get_type() functions. + + * gtk/gtk.def: Updates for above + + * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}: + Remove from CVS, no longer used. + + * configure.in: Remove checks for awk. + Sat Mar 2 04:44:10 2002 Tim Janik * gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 73439a07e2..0ee435d6e1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,23 @@ +Sat Mar 2 13:26:58 2002 Owen Taylor + + * gtk/Makefile.am: Switch style of stamp file usage. + + * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported + enumeration/fags TYPE variables over to macros for get_type() functions, + for lazy definition and to get rid of expensive relocations. + + * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch] + gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch] + gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type + definitions over manually coded get_type() functions. + + * gtk/gtk.def: Updates for above + + * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}: + Remove from CVS, no longer used. + + * configure.in: Remove checks for awk. + Sat Mar 2 04:44:10 2002 Tim Janik * gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 73439a07e2..0ee435d6e1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,23 @@ +Sat Mar 2 13:26:58 2002 Owen Taylor + + * gtk/Makefile.am: Switch style of stamp file usage. + + * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported + enumeration/fags TYPE variables over to macros for get_type() functions, + for lazy definition and to get rid of expensive relocations. + + * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch] + gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch] + gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type + definitions over manually coded get_type() functions. + + * gtk/gtk.def: Updates for above + + * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}: + Remove from CVS, no longer used. + + * configure.in: Remove checks for awk. + Sat Mar 2 04:44:10 2002 Tim Janik * gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 73439a07e2..0ee435d6e1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,23 @@ +Sat Mar 2 13:26:58 2002 Owen Taylor + + * gtk/Makefile.am: Switch style of stamp file usage. + + * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported + enumeration/fags TYPE variables over to macros for get_type() functions, + for lazy definition and to get rid of expensive relocations. + + * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch] + gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch] + gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type + definitions over manually coded get_type() functions. + + * gtk/gtk.def: Updates for above + + * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}: + Remove from CVS, no longer used. + + * configure.in: Remove checks for awk. + Sat Mar 2 04:44:10 2002 Tim Janik * gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 73439a07e2..0ee435d6e1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,23 @@ +Sat Mar 2 13:26:58 2002 Owen Taylor + + * gtk/Makefile.am: Switch style of stamp file usage. + + * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported + enumeration/fags TYPE variables over to macros for get_type() functions, + for lazy definition and to get rid of expensive relocations. + + * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch] + gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch] + gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type + definitions over manually coded get_type() functions. + + * gtk/gtk.def: Updates for above + + * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}: + Remove from CVS, no longer used. + + * configure.in: Remove checks for awk. + Sat Mar 2 04:44:10 2002 Tim Janik * gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo. diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 443ebb087d..0484fe7771 100644 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -14,16 +14,14 @@ gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c +gtktypebuiltins.c gtktypebuiltins.h -gtktypebuiltins_ids.c -gtktypebuiltins_vars.c -gtktypebuiltins_evals.c +gtktypebuiltinss.c gtk.defs gtk-win32.rc testdnd stamp-gtktypebuiltins.h stamp-gtkmarshal.h stamp-gtkmarshalers.h -stamp-gtk.defs gtk-query-immodules-2.0 .saved diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 779bea0c9c..0115e06d0e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -385,6 +385,7 @@ gtk_c_sources = @STRIP_BEGIN@ \ gtktreestore.c \ gtktreeview.c \ gtktreeviewcolumn.c \ + gtktypebuiltins.c \ gtktypeutils.c \ gtkvbbox.c \ gtkvbox.c \ @@ -423,9 +424,7 @@ gtk_built_sources = @STRIP_BEGIN@ \ stamp-gtk.defs \ stamp-gtktypebuiltins.h \ stamp-gtkmarshalers.h \ - gtktypebuiltins_vars.c \ - gtktypebuiltins_ids.c \ - gtktypebuiltins_evals.c \ + gtktypebuiltins.c \ gtkmarshalers.c \ gtkmarshalers.h \ gtkmarshal.c \ @@ -437,8 +436,6 @@ gtk_built_sources = @STRIP_BEGIN@ \ # their own .lo rules and don't get publically installed gtk_extra_sources = @STRIP_BEGIN@ \ gtkversion.h.in \ - maketypes.awk \ - makeenums.h \ gtk-boxed.defs \ gtkmarshalers.list \ gtkmarshal.list \ @@ -456,44 +453,40 @@ EXTRA_DIST += $(gtk_built_sources) # rules to generate built sources # # setup autogeneration dependancies -gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc +gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc CLEANFILES = $(gen_sources) -## automake 1.5 supports this without the horrible 'oldest-source-stamp' -## hack below +## automake 1.5 supports this without $(OBJECTS): $(gtk_built_sources) hack #BUILT_SOURCES = $(gtk_built_sources) -Makefile: oldest-source-stamp # oh boy, does automake SUCK! -oldest-source-stamp: $(gtk_built_sources) -$(OBJECTS): oldest-source-stamp ${gtk_built_public_sources} # this is our oldest file, used for implicit auto-generation deps +$(libgtk_x11_1_3_la_OBJECTS) $(libgtk_linux_fb_1_3_la_OBJECTS) $(libgtk_win32_1_3_la_OBJECTS): ${gtk_built_public_sources} -# initial creation of the real stamp-* files -gtk.defs gtkmarshalers.h gtktypebuiltins.h: # never add deps here - test -f "$(srcdir)/$(@F)" || touch $(srcdir)/$(@F) -# normal autogeneration rules # all autogenerated files need to be generated in the srcdir, # so old versions get remade and are not confused with newer # versions in the build dir. thus a development setup requires # srcdir to be writable, passing --disable-rebuilds to # ../configure will supress all autogeneration rules. -$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) - case @GLIB_MKENUMS@ in \ - .*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;; \ - *) glib_mkenums=@GLIB_MKENUMS@ ;; \ - esac; \ - cd $(srcdir) \ - && $$glib_mkenums --comments ";; @comment@" \ - --fprod "; enumerations from \"@filename@\"\n " \ - --vhead "(define-@type@ @EnumName@" \ - --vprod " (@valuenick@ @VALUENAME@)" \ - --vtail ")" \ - $(gtk_public_h_sources) > xgen-gdef \ - && cat gtk-boxed.defs >> xgen-gdef \ - && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \ - && rm -f xgen-gdef \ - && echo timestamp > $(@F) - -$(srcdir)/stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list gtkmarshalers.h +$(srcdir)/gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) \ + case @GLIB_MKENUMS@ in \ + .*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;; \ + *) glib_mkenums=@GLIB_MKENUMS@ ;; \ + esac; \ + cd $(srcdir) \ + && $$glib_mkenums --comments ";; @comment@" \ + --fprod "; enumerations from \"@filename@\"\n " \ + --vhead "(define-@type@ @EnumName@" \ + --vprod " (@valuenick@ @VALUENAME@)" \ + --vtail ")" \ + $(gtk_public_h_sources) > xgen-gdef \ + && cat gtk-boxed.defs >> xgen-gdef \ + && gtk.defs || cp xgen-gdef gtk.defs \ + && rm -f xgen-gdef + +all-local: @REBUILD@ gtk.defs + +$(srcdir)/gtkmarshalers.h: stamp-gtkmarshalers.h + @true +stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list case @GLIB_GENMARSHAL@ in \ .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ @@ -502,8 +495,8 @@ $(srcdir)/stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list gtkmarshalers.h && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >> xgen-gmlh \ && (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \ && rm -f xgen-gmlh \ - && echo timestamp > $(@F) -$(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h + && echo timestamp > $(@F) +$(srcdir)/gtkmarshalers.c: @REBUILD@ gtkmarshalers.list case @GLIB_GENMARSHAL@ in \ .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ @@ -511,8 +504,11 @@ $(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h cd $(srcdir) \ && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >> xgen-gmlc \ && cp xgen-gmlc gtkmarshalers.c \ - && rm -f xgen-gmlc -$(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list + && rm -f xgen-gmlc + +$(srcdir)/gtkmarshal.h: stamp-gtkmarshal.h + @true +stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list case @GLIB_GENMARSHAL@ in \ .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ @@ -521,9 +517,10 @@ $(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list && echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh \ && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \ && echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh \ - && cp xgen-gmh gtkmarshal.h \ - && rm -f xgen-gmh -$(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h + && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \ + && rm -f xgen-gmh \ + && echo timestamp > $(@F) +$(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.list case @GLIB_GENMARSHAL@ in \ .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ @@ -533,37 +530,28 @@ $(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h && cp xgen-gmc gtkmarshal.c \ && rm -f xgen-gmc -$(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h - cd $(srcdir) \ - && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \ - && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h) \ +$(srcdir)/gtktypebuiltins.h: stamp-gtktypebuiltins.h + @true +stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile + ( cd $(srcdir) && glib-mkenums \ + --fhead "#ifndef __GTK_TYPE_BUILTINS_H__\n#define __GTK_TYPE_BUILTINS_H__\n\n#include \n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \ + $(gtk_public_h_sources) ) >> xgen-gtbh \ + && (cmp -s xgen-gtbh $(srcdir)/gtktypebuiltins.h || cp xgen-gtbh $(srcdir)/gtktypebuiltins.h ) \ && rm -f xgen-gtbh \ && echo timestamp > $(@F) -$(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs - cd $(srcdir) \ - && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \ - && cp xgen-gtbvc $(@F) \ - && rm -f xgen-gtbvc -$(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs - cd $(srcdir) \ - && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \ - && cp xgen-gtbic $(@F) \ - && rm -f xgen-gtbic -$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources) - case @GLIB_MKENUMS@ in \ - .*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;; \ - *) glib_mkenums=@GLIB_MKENUMS@ ;; \ - esac; \ - cd $(srcdir) \ - && $$glib_mkenums \ +$(srcdir)/gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile + ( cd $(srcdir) && glib-mkenums \ + --fhead "#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \ --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "static const GtkEnumValue _@enum_name@_values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};" \ - $(gtk_public_h_sources) > xgen-gtbec \ - && cp xgen-gtbec $(@F) \ - && rm -f xgen-gtbec - + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $(gtk_public_h_sources) ) > xgen-gtbc \ + && cp xgen-gtbc $(srcdir)/gtktypebuiltins.c \ + && rm -f xgen-gtbc # target platform: lib_LTLIBRARIES = $(gtktargetlib) diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl deleted file mode 100755 index cfde7948b7..0000000000 --- a/gtk/genmarshal.pl +++ /dev/null @@ -1,157 +0,0 @@ -#!/usr/bin/perl -w -# -# by Elliot Lee - -%trans = ( "NONE"=>"void", "CHAR"=>"char", - "BOOL"=>"gboolean", "INT"=>"gint", - "UINT"=>"guint", "LONG"=>"glong", - "ULONG"=>"gulong", "FLOAT"=>"gfloat", - "DOUBLE"=>"gdouble", "STRING"=>"gpointer", - "ENUM"=>"gint", "FLAGS"=>"gint", - "BOXED"=>"gpointer", - "POINTER"=>"gpointer", - "OBJECT"=>"gpointer", - -# complex types. These need special handling. - "SIGNAL"=>"SIGNAL" - ); - -if ($#ARGV != 2) { - die ("Wrong number of arguments given, need "); -} - -open(IL, "<" . $ARGV[0]) || die ("Open failed: $!"); -open(OH, ">" . $ARGV[1]) || die ("Open failed: $!"); -open(OS, ">" . $ARGV[2]) || die ("Open failed: $!"); - -print OH < -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE - -EOT - -print OS qq(#include "gtkmarshal.h"\n\n); - -while (defined($aline = )) { - chomp $aline; - ($retval, $paramlist) = split(/:/, $aline, 2); - @params = split(/\s*,\s*/, $paramlist); - - my $funcname = $retval."__".join("_",@params); - my $defname; - - next if (exists $defs{$funcname}); - - $doequiv = 0; - for (@params, $retval) { - if ($trans{$_} eq "gpointer" && $_ ne "POINTER") { - $doequiv = 1; - last; - } - if($_ eq "ENUM" || $_ eq "UINT" || $_ eq "ULONG") { - $doequiv = 1; - last; - } - } - - # Translate all function pointers to gpointer - $defname = $funcname; - if($doequiv) { - print OH "#define gtk_marshal_$funcname "; - $defs{$defname} = 1; - - for (@params, $retval) { - if ($trans{$_} eq "gpointer") { - $_ = "POINTER"; - } - if($_ eq "ENUM") { - $_ = "UINT"; - } - if($_ eq "UINT") { - $_ = "INT"; # Unvalidated assumption - please check - } - if($_ eq "ULONG") { - $_ = "LONG"; - } - } - - $funcname = $retval."__".join("_",@params); - - print OH "gtk_marshal_$funcname\n\n"; - next if (exists $defs{$funcname}); - } - $defs{$funcname} = 1; - - print OH < /* for gtktypebuiltins_ids.c */ -#include /* gtktypebuiltins_ids.c */ - void gtk_type_init (GTypeDebugFlags debug_flags) { @@ -130,19 +108,6 @@ gtk_type_init (GTypeDebugFlags debug_flags) if (!initialized) { - static struct { - gchar *type_name; - GtkType *type_id; - GtkType parent; - gconstpointer pointer1; - gpointer pointer2; - } builtin_info[GTK_TYPE_N_BUILTINS + 1] = { -#include "gtktypebuiltins_ids.c" /* type entries */ - { NULL } - }; - GTypeInfo tinfo = { 0, }; - guint i; - initialized = TRUE; /* initialize GLib type system @@ -152,36 +117,21 @@ gtk_type_init (GTypeDebugFlags debug_flags) /* GTK_TYPE_OBJECT */ gtk_object_get_type (); + } +} - /* GTK_TYPE_IDENTIFIER - */ - GTK_TYPE_IDENTIFIER = g_type_register_static (G_TYPE_STRING, "GtkIdentifier", &tinfo, 0); - - /* enums and flags - */ - for (i = 0; i < GTK_TYPE_N_BUILTINS; i++) - { - GtkType type_id = 0; - - if (builtin_info[i].parent == G_TYPE_ENUM) - type_id = g_enum_register_static (builtin_info[i].type_name, builtin_info[i].pointer1); - else if (builtin_info[i].parent == G_TYPE_FLAGS) - type_id = g_flags_register_static (builtin_info[i].type_name, builtin_info[i].pointer1); - else if (builtin_info[i].parent == GTK_TYPE_BOXED) - { - if (builtin_info[i].pointer1 && builtin_info[i].pointer2) - type_id = g_boxed_type_register_static (builtin_info[i].type_name, - builtin_info[i].pointer1, - builtin_info[i].pointer2); - else - type_id = g_type_register_static (GTK_TYPE_BOXED, builtin_info[i].type_name, &tinfo, 0); - } - else - g_assert_not_reached (); - - *builtin_info[i].type_id = type_id; - } +GType +gtk_identifier_get_type (void) +{ + static GType our_type = 0; + + if (our_type == 0) + { + GTypeInfo tinfo = { 0, }; + our_type = g_type_register_static (G_TYPE_STRING, "GtkIdentifier", &tinfo, 0); } + + return our_type; } GtkEnumValue* @@ -243,3 +193,4 @@ gtk_type_flags_find_value (GtkType flags_type, return value; } + diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h index 494069864f..2200af8afa 100644 --- a/gtk/gtktypeutils.h +++ b/gtk/gtktypeutils.h @@ -105,6 +105,9 @@ G_END_DECLS G_BEGIN_DECLS +/* urg */ +#define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ()) +GType gtk_identifier_get_type (void); /* --- typedefs --- */ /* here we come with some necessary forward declarations for structures and @@ -249,19 +252,6 @@ GtkEnumValue* gtk_type_enum_find_value (GtkType enum_type, GtkFlagValue* gtk_type_flags_find_value (GtkType flags_type, const gchar *value_name); -#ifdef G_OS_WIN32 -# ifdef GTK_COMPILATION -# define GTKTYPEUTILS_VAR __declspec(dllexport) -# else -# define GTKTYPEUTILS_VAR extern __declspec(dllimport) -# endif -#else -# define GTKTYPEUTILS_VAR extern -#endif - -/* urg */ -GTKTYPEUTILS_VAR GType GTK_TYPE_IDENTIFIER; - #endif /* GTK_DISABLE_DEPRECATED */ G_END_DECLS diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 57c5d38b44..3c7369b529 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -6371,6 +6371,19 @@ gtk_requisition_free (GtkRequisition *requisition) g_free (requisition); } +GType +gtk_requisition_get_type (void) +{ + static GType our_type = 0; + + if (our_type == 0) + our_type = g_boxed_type_register_static ("GtkTypeRequisition", + (GBoxedCopyFunc) gtk_requisition_copy, + (GBoxedFreeFunc) gtk_requisition_free); + + return our_type; +} + AtkObject* gtk_widget_get_accessible (GtkWidget *widget) { @@ -6430,4 +6443,3 @@ gtk_widget_ref_accessible (AtkImplementor *implementor) g_object_ref (G_OBJECT (accessible)); return accessible; } - diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 1be3abb9f6..2176e71f06 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -131,6 +131,7 @@ typedef enum #define GTK_WIDGET_SET_FLAGS(wid,flag) G_STMT_START{ (GTK_WIDGET_FLAGS (wid) |= (flag)); }G_STMT_END #define GTK_WIDGET_UNSET_FLAGS(wid,flag) G_STMT_START{ (GTK_WIDGET_FLAGS (wid) &= ~(flag)); }G_STMT_END +#define GTK_TYPE_REQUISITION (gtk_requisition_get_type ()) /* forward declaration to avoid excessive includes (and concurrent includes) */ @@ -737,8 +738,9 @@ void gtk_widget_class_path (GtkWidget *widget, gchar **path, gchar **path_reversed); -GtkRequisition *gtk_requisition_copy (const GtkRequisition *requisition); -void gtk_requisition_free (GtkRequisition *requisition); +GType gtk_requisition_get_type (void); +GtkRequisition *gtk_requisition_copy (const GtkRequisition *requisition); +void gtk_requisition_free (GtkRequisition *requisition); #if defined (GTK_TRACE_OBJECTS) && defined (__GNUC__) # define gtk_widget_ref gtk_object_ref diff --git a/gtk/makeenums.awk b/gtk/makeenums.awk deleted file mode 100644 index eaec10d134..0000000000 --- a/gtk/makeenums.awk +++ /dev/null @@ -1,152 +0,0 @@ - -BEGIN { - type_name = ""; # GtkEnumType - type_macro = ""; # GTK_TYPE_ENUM_TYPE - type_ident = ""; # _gtk_enum_type - type_flags = 0; - type_counter = 0; - delete value_names; # GTK_ENUM_VALUE - delete value_nicks; # enum-value - VI = 0; - gen_arrays = 0; - gen_defs = 0; - comment_file = ""; - - for (i = 1; i < ARGC; i++) - { - if (ARGV[i] == "arrays") - gen_arrays = 1; - else if (ARGV[i] == "defs") - gen_defs = 1; - ARGV[i] = ""; - } - - if (gen_arrays) - printf ("/* generated by makeenums.awk */\n\n"); - else if (gen_defs) - printf (";; generated by makeenums.awk ; -*- scheme -*-\n\n"); - else - { - printf ("hm? what do you want me to do?\n") > "/dev/stderr"; - exit 1; - } -} - -function set_type (set_type_1) -{ - type_name = set_type_1; - type_macro = "GTK_TYPE"; - type_ident = ""; - for (i = 0; i < length (type_name); i++) - { - ch = substr (type_name, i + 1, 1); - Ch = toupper (ch); - if (Ch == ch) - { - type_macro = type_macro "_" Ch; - type_ident = type_ident "_" tolower (ch); - } - else - { - type_macro = type_macro Ch; - type_ident = type_ident ch; - } - } -} - -function set_value (set_value_1, set_value_2) -{ - value_names[VI] = set_value_1; - value_nicks[VI] = tolower (set_value_2); - while (match (value_nicks[VI], "_")) - sub ("_", "-", value_nicks[VI]); -} - -function generate_arrays () -{ - if (gen_arrays) - { - printf ("static GtkEnumValue %s_values[] = {\n", type_ident); - for (i = 0; i < VI; i++) - { - printf (" { %s, \"%s\", \"%s\" },\n", - value_names[i], value_names[i], value_nicks[i]); - } - printf (" { 0, NULL, NULL }\n"); - printf ("};\n"); - } -} - -function generate_defs () -{ - if (gen_defs) - { - if (comment_file != "") - { - printf ("\n; enumerations from \"%s\"\n", comment_file); - comment_file = ""; - } - - printf ("\n(define-%s %s", - type_flags ? "flags" : "enum", - type_name); - for (i = 0; i < VI; i++) - { - printf ("\n (%s %s)", - value_nicks[i], value_names[i]); - } - printf (")\n"); - } -} - -function basename (basename_1) -{ - sub ("\"", "", basename_1); - while (match (basename_1, "/")) - sub (".*/", "", basename_1); - sub ("\"", "", basename_1); - return basename_1; -} - -# parse keywords - -/G_ENUM_E/ { - if ($3 != "+" || $5 != "+") - printf ("huh? G_ENUM_E keyword without arg?\n") > "/dev/stderr"; - else - set_type($4); - type_flags = 0; - - generate_defs(); - generate_arrays(); - VI = 0; -} - -/G_ENUM_F/ { - if ($3 != "+" || $5 != "+") - printf ("huh? G_ENUM_F keyword without arg?\n") > "/dev/stderr"; - else - set_type($4); - type_flags = 1; - - generate_defs(); - generate_arrays(); - VI = 0; -} - -/G_ENUM_V/ { - if ($2 != "+" || $4 != "+" || $6 != "+") - printf ("huh? G_ENUM_V keyword without arg?\n") > "/dev/stderr"; - else - set_value($3, $5); - VI += 1; -} - -# feature per file comments -/# / { - comment_file = basename($3); -} - -END { - printf("\n"); -} diff --git a/gtk/makeenums.h b/gtk/makeenums.h deleted file mode 100644 index 3d42f093d5..0000000000 --- a/gtk/makeenums.h +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include -#include -#include -#include diff --git a/gtk/maketypes.awk b/gtk/maketypes.awk deleted file mode 100644 index 715e6cd95d..0000000000 --- a/gtk/maketypes.awk +++ /dev/null @@ -1,155 +0,0 @@ - -BEGIN { - type_name = ""; # GtkEnumType - type_macro = ""; # GTK_TYPE_ENUM_TYPE - type_ident = ""; # _gtk_enum_type - type_counter = 0; - gen_macros = 0; - gen_entries = 0; - gen_vars = 0; - boxed_copy = ""; - boxed_free = ""; - - for (i = 2; i < ARGC; i++) - { - if (ARGV[i] == "macros") - gen_macros = 1; - else if (ARGV[i] == "entries") - gen_entries = 1; - else if (ARGV[i] == "variables") - gen_vars = 1; - ARGV[i] = ""; - } - - if (gen_macros) - { - printf ("/* type macros, generated by maketypes.awk */\n"); - printf ("\n"); - printf ("#ifdef G_OS_WIN32\n"); - printf ("# ifdef GTK_COMPILATION\n"); - printf ("# define GTKTYPEBUILTINS_VAR __declspec(dllexport)\n"); - printf ("# else\n"); - printf ("# define GTKTYPEBUILTINS_VAR extern __declspec(dllimport)\n"); - printf ("# endif\n"); - printf ("#else\n"); - printf ("# ifdef GTK_COMPILATION\n"); - printf ("# define GTKTYPEBUILTINS_VAR\n"); - printf ("# else\n"); - printf ("# define GTKTYPEBUILTINS_VAR extern\n"); - printf ("# endif\n"); - printf ("#endif\n"); - printf ("\n"); - } - else if (gen_entries) - printf ("/* type entries, generated by maketypes.awk */\n\n"); - else if (gen_vars) - printf ("/* type variables, generated by maketypes.awk */\n\n"); - else - { - printf ("hm? what do you want me to do?\n") > "/dev/stderr"; - exit 1; - } -} - -function set_type (set_type_1) -{ - type_counter += 1; - type_name = set_type_1; - type_macro = "GTK_TYPE_"; - - tmp = type_name; -# OK, the following is ridiculous, and sed s///g would be far easier - gsub ("[A-Z]", "@&", tmp); - gsub ("[^A-Z]@", "&_", tmp); - gsub ("@", "", tmp); - gsub ("[A-Z][A-Z][A-Z][0-9a-z]", "@&", tmp); - gsub ("@..", "&_", tmp); - gsub ("@", "", tmp); - type_macro = type_macro toupper (tmp); - type_ident = "_" tolower (tmp); - - sub ("^GTK_TYPE_GTK_", "GTK_TYPE_", type_macro); -} - -function generate (generate_what) -{ - if (gen_macros) - { - printf ("GTKTYPEBUILTINS_VAR GType %s;\n", type_macro); - } - if (gen_entries) - { - printf (" { \"%s\", &%s,\n", type_name, type_macro); - if (generate_what == "BOXED") - printf (" GTK_TYPE_%s, %s, %s, },\n", generate_what, boxed_copy, boxed_free); - else - printf (" GTK_TYPE_%s, %s_values },\n", generate_what, type_ident); - } - if (gen_vars) - { - printf ("GTKTYPEBUILTINS_VAR GType %s = 0;\n", type_macro); - } -} - -# skip scheme comments -";" { - sub (";.*", ""); -} - -# parse keywords - -/\(define-enum/ { - if ($2 == "") - printf ("huh? define-enum keyword without arg?\n") > "/dev/stderr"; - else - { - set_type($2); - generate("ENUM"); - } -} - -/\(define-flags/ { - if ($2 == "") - printf ("huh? define-flags keyword without arg?\n") > "/dev/stderr"; - else - { - set_type($2); - generate("FLAGS"); - } -} - -/\(define-boxed/ { - if ($2 == "") - printf ("huh? define-boxed keyword without arg?\n") > "/dev/stderr"; - else - { - boxed_copy = "NULL"; - boxed_free = "NULL"; - set_type($2); - do { - getline; - sub (";.*", "", $0); - } while ($0 ~ /^[ \t]*$/); - tmp_var1 = $1; - if ($0 ~ /\)/) { generate("BOXED"); next; } - do { - getline; - sub (";.*", "", $0); - } while ($0 ~ /^[ \t]*$/); - tmp_var2 = $1; - sub (/\).*/, "", tmp_var2); - if (tmp_var1 ~ /^[_A-Za-z][_A-Za-z0-9]*$/ && - tmp_var2 ~ /^[_A-Za-z][_A-Za-z0-9]*$/) - { - boxed_copy = tmp_var1; - boxed_free = tmp_var2; - # printf ("read boxed funcs: %s %s\n", boxed_copy, boxed_free) > "/dev/stderr"; - } - generate("BOXED"); - } -} - -END { - if (gen_macros) - printf("\n#define\tGTK_TYPE_N_BUILTINS\t(%u)\n", type_counter); -} diff --git a/gtk/oldest-source-stamp b/gtk/oldest-source-stamp deleted file mode 100644 index e69de29bb2..0000000000 -- 2.30.2